merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 27 Dec 2011 07:29:06 +0000 (16:29 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 27 Dec 2011 07:29:06 +0000 (16:29 +0900)

Trivial merge